From: Joakim Verona <joakim@verona.se>
Date: Fri, 20 Aug 2010 20:00:00 +0000 (+0200)
Subject: merge from upstream
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~844^2~3573^2~27
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=38f9163d622c5024a75775ce1a2fc9e99e4bd9cb;p=emacs.git

merge from upstream
---

38f9163d622c5024a75775ce1a2fc9e99e4bd9cb